Skip to content

[FW][IMP] academic_sale_subscription: add menu for duplicated subscriptions #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

[FW][IMP] academic_sale_subscription: add menu for duplicated subscriptions #212

wants to merge 1 commit into from

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #204

@roboadhoc
Copy link

Pull request status dashboard.

@fw-bot-adhoc
Copy link
Contributor Author

@lef-adhoc @lav-adhoc cherrypicking of pull request #204 failed.

stdout:

Auto-merging academic_sale_subscription/models/sale_order.py
Auto-merging academic_sale_subscription/__manifest__.py
CONFLICT (content): Merge conflict in academic_sale_subscription/__manifest__.py

stderr:

12:57:11.879326 git.c:444               trace: built-in: git cherry-pick c584d900f3c486e96b59b792d5d625248b83b939
error: could not apply c584d90... [IMP] academic_sale_subscription: add button to create order in group
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@lef-adhoc lef-adhoc force-pushed the 18.0-17.0-t-48578-lef-hX6b-fw branch from 4ad806d to af9dc94 Compare February 20, 2025 19:41
@lef-adhoc
[IMP] academic_sale_subscription: add button to create order in group
5b60c63 
closes ingadhoc#202

Signed-off-by: matiasperalta1 <mnp@adhoc.com.ar>
X-original-commit: 88a2815
@lef-adhoc lef-adhoc force-pushed the 18.0-17.0-t-48578-lef-hX6b-fw branch from af9dc94 to 5b60c63 Compare February 20, 2025 19:44
@lef-adhoc
Copy link
Contributor

@roboadhoc r+

@roboadhoc roboadhoc closed this in e853314 Feb 20, 2025
@roboadhoc roboadhoc added the 17.1 label Feb 20, 2025
@lef-adhoc lef-adhoc deleted the 18.0-17.0-t-48578-lef-hX6b-fw branch February 21, 2025 14:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
17.1 conflict forwardport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fw-bot-adhoc @roboadhoc @lef-adhoc